track_recompute: don't recompute speed if we already have it.

diff --git a/gpsbabel/route.c b/gpsbabel/route.c
index 255129ad7a1df93da32bbdfee47f925de8f3381f..e6f8b1ff68b24a7cfada6d2a44436e3babf9bc60 100644 (file)
--- a/gpsbabel/route.c
+++ b/gpsbabel/route.c
@@ -565,10 +565,15 @@ void track_recompute(const route_head *trk, computed_trkdata **trkdatap)
                }
 
                /*
-                * If we've moved as much as a meter, recompute speed.
+                * If we've moved as much as a meter, 
+                * conditionally recompute speeds.
                 */
                if (timed && (dist > 1)) {
-                       WAYPT_SET(this, speed, dist / labs(timed));
+                       if(!WAYPT_HAS(this, speed)) {
+                               // Only recompute speed if the waypoint
+                               // didn't already have a speed
+                               WAYPT_SET(this, speed, dist / labs(timed));
+                       }
                        if (this->speed > tdata->max_spd) {
                                tdata->max_spd = this->speed;
                        }